Merge "[Provider Model] Show gear icon for Printer/GoPro Wi-Fi network" into sc-qpr1-dev am: 67bd92262c

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

Change-Id: Ib62cb6ee44af3c8dc881c04ed435394c2fcf82f2