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