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