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

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

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