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