Merge "Add types-only AIDL package android.hardware.wifi.common." into main