Merge "framework-wifi: fix miscellaneous @hide API usages"