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

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

Change-Id: I6290df0d2fcb4bc8181d26cccaadda39754c1613