[automerger skipped] Merge "Revamp SD card UX" into tm-qpr-dev am: e66ae3f9...

[automerger skipped] Merge "Revamp SD card UX" into tm-qpr-dev am: e66ae3f9 am: 05b7cb02 -s ours

am skip reason: Merged-In I757abc6076fcc8f467d8faed9f090bcdd5774ff3 with SHA-1 9b432d54 is already in history

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



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