Merge "Keystore 2.0: Add earlyBootEnded() to IKeystoreMaintenance"