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