Merge cherrypicks of [3536650, 3536562, 3536563, 3536481, 3535874, 3536495, 3536496, 3536632, 3536633, 3536434, 3535900] into oc-m2-release

Change-Id: I5665b657607cd31a5ca9ce74371037726ba43145

Author: android-build-team Robot

proto/src/wifi.proto

@@ -673,6 +673,10 @@ message StaEvent {
     // Framework initiated disconnect. Sometimes generated to give an extra reason for a disconnect
     // Should typically be followed by a NETWORK_DISCONNECTION_EVENT with a local_gen = true
     TYPE_FRAMEWORK_DISCONNECT = 15;
+
+    // The NetworkAgent score for wifi has changed in a way that may impact
+    // connectivity
+    TYPE_SCORE_BREACH = 16;
   }
 
   enum FrameworkDisconnectReason {
@@ -784,6 +788,9 @@ message StaEvent {
 
   // Authentication failure reason, as reported by WifiManager (calculated from state & deauth code)
   optional AuthFailureReason auth_failure_reason = 13 [default = AUTH_FAILURE_UNKNOWN];
+
+  // NetworkAgent score of connected wifi
+  optional int32 last_score = 14 [default = -1];
 }
 
 // Wi-Fi Aware metrics