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