Merge "Camera3: Add missing mTriggerMutex lock" am: ad4663c5a5
am: fa43b5468f

Change-Id: I588e89df0dd601c3f3ca531b2ce2b2b997335cee