Merge "camera: add a lock for the request tracker"
am: 8c3812f639

Change-Id: I3b12af65ca2ba3d20f9e52200c0c4aa15629530a