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