Merge "passpoint-r2: unregister ConnectivityCallbacks when it disconnects OSU AP"