Merge "Correctly check permission and app identity for tethering"
am: 4ed03e17db

Change-Id: I5258823f9b65b8010b8eb946c6ce5eab2c4bf0f8