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