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