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