Merge "storaged: Fix bug in empty check" am: 46de7add81 am: 2ae516ef50 am: 86bf65e53b

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

Change-Id: I52207414f6f2c4a90ab18e53b9a2742162a21630