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