Merge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev
am: f08fb3449b

Change-Id: Ia7185a003b066a20abf5fcfd687d668af61b45ad