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

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

Change-Id: I9ac97e43377071445e561c3be43c935a39a11c9f