Merge "Remove Wifi APIs unused in AOSP." am: 268fd3556d am: 1244d206d3

Change-Id: Ifd583e5e3575fce25c279d5df4d9af3b67e8b80d