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