Merge "Add isUnlockedDeviceRequired() method to KeyInfo" into main