Merge "Make apex availability to com.android.wifi explicit" into main