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

Change-Id: Idf53e22c091914d504830e24e76c3936ef5e6257