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

Change-Id: I5691a50ecc956c9b13ccea272187caba223a1f5b