Merge "Keystore 2.0: Add early_boot_ended permission"