[automerger skipped] aaudio: lock transport methods am: 10710e46 am:...

[automerger skipped] aaudio: lock transport methods am: 10710e46 am: fa24d44e -s ours am: 2d74c3f3 -s ours am: 0e40d2df -s ours

am skip reason: Change-Id I5920cf78af4501856756c5c2fc8e77758232508a with SHA-1 7ebbc110 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11491867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32c28f0d94b485a35713167173b44953d1b5289c