Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev am: 456dc6cc86
am: 39e2d42dcb  -s ours

Change-Id: Ie86915af1be6fa0a394f85f058b9a0006296b1d8