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