Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev
am: 48e25765d1  -s ours

Change-Id: Ie7acfad590d5069717373f2a79c1cbe5372bee0d