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

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

Change-Id: I41a82ce12fa6d49fc004c586738dd2ae9b97e4eb