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