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