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