Merge "Add rollback resistance support to keymaster impl." am: 26b3eac654 am: 0f5537d508

Change-Id: Ie43631ae1fab8b6e45b2e6f4edbf40c36b24d444