Merge "[WIFI][METRICS] Update Passpoint and RTT metrics collection criteria" into pi-dev