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