Merge "Show USB flash drive in storage spinner when it's unmounted" into...

Merge "Show USB flash drive in storage spinner when it's unmounted" into tm-dev am: e6389f63 am: cc6ce210

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



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