Merge "wifi: Add subfilters for android.hardware.wifi" into rvc-dev am: 661a6fdd56 am: 06eaba2f8d am: d427e4c8aa am: 1a307b6017

Change-Id: I489d663b47d83cb1b37b1742bc339437a7179f22