[automerger skipped] Merge "Camera: Don't hold 'mLock' when closing the camera...
[automerger skipped] Merge "Camera: Don't hold 'mLock' when closing the camera session" into pie-vts-dev am: 75ceb36b am: a89c2d37
am: dbd2de54 -s ours
Change-Id: I001f9cd9034d0637a934d020cf4cfcd8bd7980b4