Merge "trusty: utils: rpmb_dev: rpmb_dev.test.system.rc: support test_vm_os"...

Merge "trusty: utils: rpmb_dev: rpmb_dev.test.system.rc: support test_vm_os" into main am: c7321a8d am: ee0acaca

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



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