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

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

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