Merge "Plumb WiFi multicast filter through to ApfFilter" into nyc-dev
am: 1059494

* commit '10594942c63e5696b45be7bcc12758f46f5d1a19':
  Plumb WiFi multicast filter through to ApfFilter

Change-Id: Ifb48a372d0335f7025be1e7f4004bb0b9cb1fc9d