Merge "Tethering: Fix hidden API selectBestRoute" am: 385c17e1c9 am: 4bd5b588b0

Change-Id: I7663dcc98fd600f08e079d716679a532e78b915a