[automerger skipped] [RESTRICT AUTOMERGE] [Provider Model] Support 2+ lines...

[automerger skipped] [RESTRICT AUTOMERGE] [Provider Model] Support 2+ lines instead of marque for Mobile data and Wi-Fi am: fc0d0bc3 am: 04f79eee -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15683506

Change-Id: I5ea6c77421bf7b36cb12283e047ab3f31c8d23c6