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