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

Change-Id: Ifa50f081522c050afa4035482da110c3cdc65004