Merge "Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: fa45c06a62 am: b85b487e31" into qt-dev-plus-aosp
am: 7fecc34996

Change-Id: Ifa4ec98d5c942522dfd569664f169fa841d495ed