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