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