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