Merge "storaged: test do not crash on cuttlefish." am: ecbf9e4f7a am: 94fd5ca73c

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

Change-Id: I3bcdef37169aca67874dc4103895b48b50b664cb