Merge "Fix unmuting both cam and mic at the same time" into sc-dev am:...

Merge "Fix unmuting both cam and mic at the same time" into sc-dev am: 31bb5762 am: 2116e6ea am: 9e751845

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

Change-Id: Iccaced387de18ed6b097b533b81e8d8388d1f2bd