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