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