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

Change-Id: I22c120daafb6723d2b641a5bc01de6064cd0152b