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