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