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