Merge "Ensure that clearing the BlobCache sets mTotalSize to 0" am: 2f5adcb938 am: a47ecc53de am: 2879d60c71

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2451163

Change-Id: If73d8f353921bd4459a485f9029f716926dab1f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>