Merge "Add support for mocked RPMB"
am: be9de1ab86

Change-Id: Ifbb116a5b39355a6bf7e905f88d4311ad175bdf1