[automerger skipped] Merge "Tethering: Fix hidden API selectBestRoute" am: 385c17e1c9 am: 4bd5b588b0 am: bb3fc0b544 -s ours
am skip reason: Change-Id I824a05fac8b606123667d20ab9b1f7de905e4088 with SHA-1 38d3b2c9f0 is in history

Change-Id: Idf50196df385b73ae463660b6339f478225f1719