Merge "Prepare sepolicy for launching Keystore 2.0 service"