Merge "Add policy for IKeystoreAuthorization AIDL service."