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