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

Change-Id: I0fbb1098a246db4dd2b0a6b9720dea275be23a42