Merge "Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am: f14c1e12cf am: 41b743d8ad" into oc-dr1-dev-plus-aosp
am: 17c78a1e6b

Change-Id: If88fde815c8e25c6316ca01c162311555a99c322