Merge "Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: fa45c06a am: b85b487e" into qt-dev-plus-aosp