Merge "Split addWifiLockAcqSession into separate methods for WifiLockManager and MulticastLockManager." into main