[automerger skipped] Merge "Camera: Don't hold 'mLock' when closing the camera session" into pie-vts-dev
am: 75ceb36b27  -s ours

Change-Id: I738d19b64b88344ba3cde628a8e723ffcddae3c3