[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 24f951ee00 am: c382a1065a -s ours am: 867e00c6f8 -s ours

am skip reason: Change-Id I508095fa6285ade14dc831dc1ccee2d0486cf76e with SHA-1 5614a9cdbc is in history

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

Change-Id: Id60e69ed9c39dafbde74647f5ea64f9cd0c361e3