[automerger skipped] Merge "Modify audio-framework-aconfig as...

[automerger skipped] Merge "Modify audio-framework-aconfig as aconfig_declarations_group module type" into aosp-main-future am: 3f95616e -s ours

am skip reason: Merged-In Iab5a580ca87f2b9ff0441a1b374f3ee59a521954 with SHA-1 e6d6d4f1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/26254386



Change-Id: I6303f01a29bc986006fa1996c1954caa5bbe55f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>