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