[automerger skipped] Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master
am: 1bee26f4c3  -s ours

Change-Id: I236396a3080e5b435db417ba2ed10485232976ec