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