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: I982989cf5f738987b13034391a58fc37a57ce54e