Merge changes from topic "health_storage_aidl" am: 3355ff7790

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1550388

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I054f6f4345d96f9be12934bb5632951f24ee0ba0