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