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

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

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