[automerger skipped] Merge "A2DP: JNI callback to query if mandatory codec is...
[automerger skipped] Merge "A2DP: JNI callback to query if mandatory codec is more preferred" into rvc-dev am: 7fea23b6 am: a3691157 -s ours
am skip reason: Change-Id Ife9ba2686c434d689ba211dc3e8c2d16ac1526e7 with SHA-1 fcd4a7d8 is in history
Change-Id: I4ad2a7d2e63e26c79ebcb3176240a5872b96c3a0