[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 qt-dev am: c8984335 am: 6cba5703 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec00c49e1b6f6951cb3022ef6f7eeb6b6343bd71