Merge "Change dangerous permission log order. https://cs.corp.google.com/piper///depot/google3/logs/proto/wireless/android/stats/platform/westworld/atoms.proto?rcl=253705450&g=0&l=2989 the items in proto is different from what's in the logs." into qt-dev

am: 10c6723386

Change-Id: I13b3dc7066982234f3a97243941d7b97b8eb529c

services/core/java/com/android/server/stats/StatsCompanionService.java

@@ -1983,10 +1983,9 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
                         e.writeString(permName);
                         e.writeInt(pkg.applicationInfo.uid);
                         e.writeString(pkg.packageName);
-                        e.writeInt(permissionFlags);
-
                         e.writeBoolean((pkg.requestedPermissionsFlags[permNum]
                                 & REQUESTED_PERMISSION_GRANTED) != 0);
+                        e.writeInt(permissionFlags);
 
                         pulledData.add(e);
                     }