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