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

Change-Id: I3297e8ebaf16ac82d78f7bff8a3bc3e98b7103e1