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