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