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: I486039557b78aa6e4df343e5144b1801ff547a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>