Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5

Original change: undetermined

Bug: 136411965

Change-Id: I883a0670da87df1b29f76f64081f9c15bd18256f
(cherry picked from commit 2ea319923c3c6da2bb6c310a8f082ad9ca9f23d5)
1 file changed