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

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



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