Merge "[km] Include non-secure KM HAL with Trusty VM in /system_ext" into main