Merge "Use appropriate API surface in framework-wifi dependencies" into main