Merge "Fix incorrect storage calculation when SD card is inserted" am:...

Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7 am: 2a0a88af am: dad4720a am: cb4de956

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780



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