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