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