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