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

Change-Id: I2a970420521d9447d71dedb373bcf3098afd3d02