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