[automerger skipped] Merge "net_test_stack_a2dp_codecs_native: Copy...

[automerger skipped] Merge "net_test_stack_a2dp_codecs_native: Copy module_controller of AndroidTestTemplate.xml" am: 24c0c0d2 -s ours am: 1c2a2351 -s ours am: 46aead0a -s ours

am skip reason: Merged-In I9876248e9e3f1da6516a14cc0d45b9cc68eb7e85 with SHA-1 b5e1eef1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2510177



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