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