Merge "Do not throw on call to isTetheringSupported w/o permission" into oc-mr1-dev