Merge changes from topic "starttimemillis-unix" into rvc-dev am: 66dd60a462 am: 2f68c7d3ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12004387

Change-Id: I47bc4a1c330c6e894d37c05182da5dae0e0e820e

2 files changed, 8 insertions, 3 deletions

diff --git a/metrics_pdd_hook.py b/metrics_pdd_hook.py
index 093f2cdf2..fa858553a 100755
--- a/metrics_pdd_hook.py
+++ b/metrics_pdd_hook.py
@@ -38,7 +38,7 @@ def is_in_aosp():
 def is_commit_msg_valid(commit_msg):
     for line in commit_msg.splitlines():
         line = line.strip().lower()
-        if line.startswith('updated-pdd') and 'true' in line:
+        if line.startswith('updated-pdd'):
             return True
 
     return False
@@ -65,11 +65,16 @@ def main():
         return 0
 
     print('This commit has changed {metrics_file}.'.format(metrics_file=metrics_file))
-    print('Please update the Wifi Metrics Privacy Design Doc (PDD) at go/wifi-metrics-pdd')
+    print('If this change added/changed/removed metrics collected from the device,')
+    print('please update the Wifi Metrics Privacy Design Doc (PDD) at go/wifi-metrics-pdd')
     print('and acknowledge you have done so by adding this line to your commit message:')
     print()
     print('Updated-PDD: TRUE')
     print()
+    print('Otherwise, please explain why the PDD does not need to be updated:')
+    print()
+    print('Updated-PDD: Not applicable - reformatted file')
+    print()
     print('Please reach out to the OWNERS for more information about the Wifi Metrics PDD.')
     return 1
 
diff --git a/service/proto/src/metrics.proto b/service/proto/src/metrics.proto
index e7c0ec89a..481ff0f14 100644
--- a/service/proto/src/metrics.proto
+++ b/service/proto/src/metrics.proto
@@ -1049,7 +1049,7 @@ message ConnectionEvent {
     CREATOR_CARRIER = 2;
   }
 
-  // Start time of the connection.
+  // Start time of the connection, in milliseconds since Unix epoch (1970-01-01).
   optional int64 start_time_millis = 1;// [(datapol.semantic_type) = ST_TIMESTAMP];
 
   // Duration to connect.