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