Merge changes from topic "health_storage_aidl" am: 2829019089

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1553199

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I166f28dd4a5fed52e4008654f4f32660baf7a2a8