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

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

Change-Id: I1c34c145dce71a98e606e8106ac818413b9f179a