[automerger skipped] [Provider Model] Show Wi-Fi icon with exclamation mark...

[automerger skipped] [Provider Model] Show Wi-Fi icon with exclamation mark am: 29aedbe5 am: fe309678 -s ours am: f684a548 -s ours

am skip reason: Merged-In I7239d56b1ad394950f61f51779f0dac611aeddea with SHA-1 29aedbe5 is already in history

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

Change-Id: If4944df0623df81cecdd5a7e03c1473d2af7d33c