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