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