Merge "Revert "framework-wifi: clean up AIDL exports""