Merge "Store apk root hash to the instance disk" am: 3787594acb

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

Change-Id: I7066da30e0f837222117cfd5762a1a7b0b8df00a