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