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

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



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