Merge "Fix following three issues in SD Card UX" into tm-qpr-dev am: f57f9883

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



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