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