Merge "APK roothash is trusted" am: 8b8106a76d am: af8146038d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1818182

Change-Id: Icbe890498f089a424dda18855d2a2785b6e7f445