Merge "Merge "Key revocation check is permissive when device is unlocked" am: a9384cdc am: 3f638d9a" into qt-qpr1-dev-plus-aosp