Fix calculateSizeBytes

dataBytes including cacheBytes, so not adding cacheBytes separately.

Bug: 236346018
Test: Unit test
Change-Id: Iac089802d16350eaed9a99c44a6c6558b03385d3
2 files changed