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