Merge "APK roothash is trusted" am: 8b8106a76d

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

Change-Id: I49df8a72a522cc35cb053d190130a70d8425e192