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