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

Change-Id: I01bfe20597ffa056694f49586edcccbebdc05cb9