Merge "QCamera2/HAL3: correct mutex lock/unlock sequence am: c0610d4f9a am: f137d40cd7 am: e955646e0c am: 5e01984a00" into oc-mr1-dev-plus-aosp