Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321 Change-Id: I4784eabb88684a4d18bf0bee1947f4178babe973 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>