Merge "Merge "Key revocation check is permissive when device is unlocked" am: a9384cdc9b am: 3f638d9a3f" into qt-qpr1-dev-plus-aosp am: 5882228ab8

Change-Id: I39879ca88d139e51e71f2fa7050ff2ee5a67b96b