Merge changes Ie79a3d67,Ia601da87,Ie593dc64 into main

* changes:
  Log WifiMulticastLockManager active sessions in WifiMetrics when filtering is re-enabled.
  Split addWifiLockActiveSession into separate methods for WifiLockManager and MulticastLockManager.
  Log WifiMulticastLockManager acquired sessions in WifiMetrics when locks are released.