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

Change-Id: If42e70eb0da24fcb91011bdf8014d4f323e86aea