Rename PermissionGrantRequestResultReported atom fields.

Test: make statsd_testdrive &&./out/host/linux-x86/bin/statsd_testdrive -p com.google.android.permissioncontroller 170
Change-Id: I1e5134e6872102e3995b84992adc25266eb6d456
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index d78de75..fa04f56 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -5775,10 +5775,10 @@
     optional int64 request_id = 1;
 
     // UID of package requesting the permission grant
-    optional int32 requesting_uid = 2 [(is_uid) = true];
+    optional int32 uid = 2 [(is_uid) = true];
 
     // Name of package requesting the permission grant
-    optional string requesting_package_name = 3;
+    optional string package_name = 3;
 
     // The permission to be granted
     optional string permission_name = 4;