[automerger skipped] Merge "Correctly check permission and app identity for...
[automerger skipped] Merge "Correctly check permission and app identity for tethering" into qt-qpr1-dev am: d347d30e -s ours
am: a7cabb39 -s ours
am skip reason: change_id I6cf29c36cf6e7229abb5be4a108efb9b9600217d with SHA1 551a4b5d is in history
Change-Id: Icaf97375b1a8525abcb0d2329782b05f4ccf32f4