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