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

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

Change-Id: I286cf502d23a94593b6436c0dc281edfda6a60ae