Merge "Fix StorageStatsService#getTotalBytes" into udc-d1-dev am: e390ee1960 am: ced1e76d96

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24603308

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