Merge "Add VINTF manifest for android.system.keystore2"