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