Merge "Camera: remove capture session lock" into oc-dr1-dev am: 104b68d0a5
am: e3fc290f96

Change-Id: I20b88a69fce9533ddca9677dfb6dd2e2c0d28fb0