Merge "Refine the DSU SD card support" am: da932b4a45 am: adf0f11de8 am: 3b3dd247cd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d4e7dc87a3eb0c40e10c5affc49d3be95fa86e0