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

Change-Id: I10d00cc7a42127f5235a97dc72f76e608dfb5fea