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