[automerger skipped] Merge "Refactor isTetheringSupported() calls" into pi-dev am: 5a36b3b6ea  -s ours
am: 5f07ff8248  -s ours

Change-Id: Ic98c6fe03e5256b5fd33d5308bf8b2cd4b7dc42c