[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc"...

[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into pi-dev am: dda50e78 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13422723

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad562f0bc9e68b3adc0fc6a4ee6a89bc35f66648