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