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