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

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

Change-Id: Id4ed22a5d98451fca1ddb58c8cb51cb30cf97676