Merge "storaged: use health HAL" am: c034ce0880 am: dfb242c8fb am: d02fb448ef am: 6f32054915

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

Change-Id: Ic7114c8212ad7e478bf5813192e83177e9870e34