[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: 742ba52c am: 175e3ac9 -s ours am: c4d0d7b0 am: e2e785e3 am: a5eb3672 -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: I5128262dcabd8d15228cd45f1ce434b397d7bb0a