[automerger skipped] Merge "Split out NetworkStack and Tethering permission"...

[automerger skipped] Merge "Split out NetworkStack and Tethering permission" am: ec33ff5b am: 2ed60973 -s ours am: 8b163db3 -s ours am: 8d71348d -s ours

am skip reason: Merged-In Ic5dea321a441c1366f5faf2ecd683a2fa708bc80 with SHA-1 41b2979d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688286

Change-Id: I558e5ebf7e584eda07c40858d7be7c77c0dec114