Merge "Keystore 2.0: Start keystore2 daemon conditionally."