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