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