[automerger skipped] Merge "Fix the storage size display values for GiB...

[automerger skipped] Merge "Fix the storage size display values for GiB measurements" into udc-dev am: 1d550fd6 am: 2e3cdd80 -s ours

am skip reason: Merged-In I6bdea4e028c2755a6979c3e5a563495aba32e785 with SHA-1 7a5cbaf7 is already in history

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



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