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