Merge "Allow bt import of android.media.audio-aconfig" into main