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