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