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