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