Merge "trusty: trusty-storage.mk: add support for Trusty VMs" into main am:...

Merge "trusty: trusty-storage.mk: add support for Trusty VMs" into main am: 79bbceb9 am: 1c3d9f4a

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



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