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

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

Change-Id: Ie1f09c15253a81a2b80aa1435470ac890fcaa0a0