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

Change-Id: Id59805016a566c35e4e32a7a4119b1d792e16989