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

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

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