[automerger skipped] Merge "Must use vendor variant for health storage AIDL...

[automerger skipped] Merge "Must use vendor variant for health storage AIDL HAL" am: ee8ae11c am: 87328318 am: 42ea9996 -s ours

am skip reason: Change-Id Iae8dc547d68ecb528c0eb9684353267c1dd30459 with SHA-1 caaef4d2 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1549747

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03630a1d589f12548c9e3d1d482d70a51bfa824d