[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 -s ours
am: 705a64e1 -s ours
Change-Id: If7cfbec3c26e2bd4818d0e2d9fc3cb9aa6086f9c