Merge changes from topic "health_storage_aidl" am: 3355ff7790 am: 92e9e5d1ad

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I500d3ccab2b4a19e71d292d17d7fac2c39e0355f