[automerger skipped] Merge "[Provider Model] Show gear icon for Printer/GoPro...

[automerger skipped] Merge "[Provider Model] Show gear icon for Printer/GoPro Wi-Fi network" into sc-qpr1-dev am: 67bd9226 am: 516c7f2b -s ours

am skip reason: Merged-In I9dc8af0ea56d86371033fda69e9ba37573cb991e with SHA-1 a0cb9839 is already in history

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

Change-Id: Iac4932467ce000f54664d6c663e50d464c09daf6