Merge "Refine the DSU SD card support" am: da932b4a45

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fb1cea8aa1b83ee9218cfca9f88c02d3607ff4b