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