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