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