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