Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into tm-qpr-dev

services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java

@@ -413,8 +413,8 @@ public class LegacyPermissionManagerService extends ILegacyPermissionManager.Stu
                 return result;
             }
             mContext.getSystemService(AppOpsManager.class).noteOpNoThrow(
-                    AppOpsManager.OP_RECEIVE_AMBIENT_TRIGGER_AUDIO, uid, packageName,
+                    AppOpsManager.OP_RECORD_AUDIO_HOTWORD, uid, packageName, attributionTag,
-                    attributionTag, reason);
+                    reason);
             return result;
         }
     }