Merge "[automerger skipped] Merge "[Provider Model] Show gear icon for Printer/GoPro Wi-Fi network" into sc-qpr1-dev am: 67bd92262c am: 516c7f2b8f -s ours" into sc-v2-dev-plus-aosp am: f3c37010e1 -s ours
am skip reason: Merged-In I9dc8af0ea56d86371033fda69e9ba37573cb991e with SHA-1 a0cb9839d2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15757343
Change-Id: I5adffcde5bec11dcdaa9cce8221ad6e3487193a1
This commit is contained in: