[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: 2bccdf15

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie228842f0dd1b0e8b8d34bd90809e79bbd222379