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