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