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