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

Change-Id: Icc0eee8c4b944bb09c95eb9842db25f5206dde85