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

Change-Id: I18410bc47cf77987fef4fbb977bec82e953c839f