Merge "Camera: Use separate lock for mStreamingRequestId" into nyc-dev am: c1e0154
am: 1304e2b

* commit '1304e2bb2347f4addac5e7a67953f65efaf7a426':

Change-Id: Icd539ae111c77e960eaf656f45eff2f3901d4236