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