Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev