Merge "[Wi-Fi] Support passport R1 expiration handling"