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