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