[automerger skipped] Restore HAL type names. am: b577060b2d -s ours

am skip reason: skipped by user smoreland

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2171622

Change-Id: Ib3e5940f7132201773088487d892a0c23fd22f7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>