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