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