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