[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 rvc-dev am: 5ad16c01 am: 54112c86 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I570dad3caa560342ebb7c43f2409d9b6540b787d