Merge "framework-wifi: clean up AIDL exports (Attempt 2)"