[automerger skipped] Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into pi-dev-plus-aosp
am: 2e1eb41ec1  -s ours

Change-Id: I4614419886138038f4ee7c2fa317d012806d022c