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