Merge "Count cache in storage categories. am: b22b85b593 am: b57a71fe08" into oc-dr1-dev-plus-aosp
am: d570ab1595

Change-Id: If3eac200a1e775165415382f5e63c50b6c65dc11