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

Change-Id: Ic6e6d465b04a0ca83927aeeeb6ab6842b39df63b