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