Merge "trusty: rpmb_dev: Prevent desync between rpmb_dev and storageproxyd" am: 30b0838b70

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

Change-Id: I85b0dfc9092d44023d5c5d5dc5bbc1a867f765e4