Merge "Associate hal_service_type with all HAL services" am: b18abcdd51 am: 71b8ad6234

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1987147

Change-Id: I195b5afcf1294146a5ced5e49edc5ae877ab62a2