Merge "trusty: utils: rpmb_dev: modify wv secure storage init.rc" into main am: 57300323f0

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

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