Merge "Add privapp permissions for DeviceDiagnostics" into main