Merge changes from topic "health_storage_aidl" am: 2829019089 am: decbab5b36 am: e7a4971f17

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I675252497f27a3f4259735d33045cf47835ce4f6