[automerger skipped] Correctly check permission and app identity for tethering
am: 487b999b -s ours
am skip reason: change_id I6cf29c36cf6e7229abb5be4a108efb9b9600217d with SHA1 10b96b3d is in history
Change-Id: I74baf9ad36ffc58fc58fa6b1d30b91d40839fdc8