am 6c72c187: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '6c72c187':
camera2/3: Fix deadlock take picture while preview callback
camera3: Fix crash in set error state.
camera2/3: Add protection to callback processing call