Merge "Fix incorrect 16_2 configuration selection based on capabilities order"...

Merge "Fix incorrect 16_2 configuration selection based on capabilities order" into main am: 033213d6

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



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