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

Merge "[km] Include non-secure KM HAL with Trusty VM in /system_ext" into main am: 5b6fbdea am: b699da62

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



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