Merge "Merge "Switch framework-wifi to use java_sdk_library" into rvc-dev am: 913a4007 am: 3bb17f52" into rvc-d1-dev-plus-aosp