[NAN] Simplify publish/subscribe configuration - merge match filters
am: 65e89d2063

Change-Id: I18018e236686cfd87fb8d9ebda420cfcd0cd1c07
tree: 5a57c27bac9b275c8bbea061c94b32b33d18f060
  1. libwifi_hal/
  2. libwifi_system/
  3. service/
  4. tests/