Merge "Modify audio-framework-aconfig as aconfig_declarations_group module type" into aosp-main-future