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: 07112669

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



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