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