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