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

Change-Id: I0f9d17f00da1b7aa31e9439036ba874427b1df75