Merge "wifi: Add subfilters for android.hardware.wifi" into rvc-dev am: 661a6fdd56 am: 5cd02cb20e am: 5c2fdb13e2 am: cd2a2ffbf5

Change-Id: Iff33a34ebd5748f198903d95840cd1fc63937432