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

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



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