[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: f4e7c9b6 -s ours
am skip reason: change_id I6cf29c36cf6e7229abb5be4a108efb9b9600217d with SHA1 10b96b3d is in history
Change-Id: If76e8fd7f2a3e6b5555754dfc5558dfffb38bd58