[automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: bd9b91acbb am: 0d7f15ab7d -s ours am: 7f29cfed64 -s ours
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 8a8e8a1c63 is in history
Change-Id: I9940d86647f4eaecf9062179ff144ac6965e297a
This commit is contained in: