Merge "rpmb_dev: Switch to RPMB provisioning scheme" am: 323353413f

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

Change-Id: Ic1bb9f2cb2b84f535fa8bd7a05f85199658d7f48