[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: c6b9de68 am: 0406f800 -s ours

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

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

Change-Id: I7749e1319e9f7809d18de97f44ae759fef00d364