[automerger skipped] DO NOT MERGE -  Mark RQ2A.210105.001 as merged. am: e9358f7917 -s ours

am skip reason: Merged-In Ifb6250515285bd80bcec783a9176ef735ad6083e with SHA-1 16c2838214 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/1700269

Change-Id: I98071cec481972a48a27fa8eca0094802e2f17cf