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