Merge "passpoint-r2: fix NullPointerException for OsuServerConnection"