Merge "Merge "Merge "Add mutual exclusion access for addOrUpdateStream and...

Merge "Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45 am: 760c2bcc am: bd580a07 am: 91e082a9 am: 7f6cc71f" into rvc-dev am: d32c56d2 am: fddf37de" into rvc-d1-dev-plus-aosp am: 5a14dec2 am: a55cfbad

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

Change-Id: I6a6731a091189f6e0adb8d1d6482dd3f9c3c5322