Merge "Fix StorageStatsService#getTotalBytes" into udc-qpr-dev am: 6b0fb6b93c am: fa81b9aa1b

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

Change-Id: If686edc04bcfa683810cbcf4a62f8002005673da
Signed-off-by: Automerger Merge Worker <[email protected]>