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