Merge "Cope with mixed KeyMint/Keymaster-4.x devices" into main