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