Merge "Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: fddf37de68" into rvc-d1-dev-plus-aosp am: 5a14dec252 am: a55cfbad8f

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

Change-Id: I6a6731a091189f6e0adb8d1d6482dd3f9c3c5322