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