Merge "trusty: utils: rpmb_dev: secure storage support for test VM" into main...

Merge "trusty: utils: rpmb_dev: secure storage support for test VM" into main am: 63051ccd am: 4f6c9484

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



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