Merge "storaged: test do not crash on cuttlefish." am: ecbf9e4f am:...

Merge "storaged: test do not crash on cuttlefish." am: ecbf9e4f am: 94fd5ca7 am: 4b83bd21 am: 5b9efa30

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1912709

Change-Id: I0beff902181dcdb700f69f6d8c13761a1fbf62d0