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