tree bb29d246e0a093b3780ff756d8f639a3cb6a4755
parent 8fb1e3145aeea6cbbee4dd9764c8899aacde7796
parent 02fc853a9080d090d01b35d7490872e0d40c73ce
author David Su <dysu@google.com> 1620076262 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1620076262 +0000

Merge changes I3a21a8c3,I225310bb,Iae7e00bc,Ifa001f24,I2c461ee6 into sc-dev

* changes:
  SupplicantStateTracker: only update BatteryStats if primary
  STA+STA WifiStateTracker interactions
  STA+STA LinkProbeManager interactions
  ClientModeImpl: Ignore NETWORK_CONNECTION_EVENT for non-target network
  WifiMonitor: add NetworkConnectionEventInfo