Merge "Refactor isTetheringSupported() calls"
am: e34c426fd3

Change-Id: Iecc4e563f151545facc23f4a24a8dbf2d6ab9822