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 am: 3ce36868

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



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