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