Merge "Add support for mocked RPMB" am: be9de1ab86
am: 8477031b7c

Change-Id: I66cc9ede9eba8220e960bdb8442cf80ef3e19a0b