Merge "Add policy for property ro.android.security.keystore2.enable"