Merge "Merge "Don't double-count external cached app data." into oc-dev am: b5a1f50f am: c11cc1d3" into oc-dr1-dev-plus-aosp