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