Merge changes Ie613b4e6,Ic9344dd2,Ief37f989 into main

* changes:
  Accept UID in the MulticastLockManager acquire and release methods.
  Monitor the importance for multicast lock owners and update filtering accordingly.
  Track the number of locks held by each active UID in WifiMulticastLockManager.