[automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 -s ours am: 1db8a8251f -s ours
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 4493983bbd is in history
Change-Id: I96b83022f7ef1e9e4f12fdd806d62da5e1f08738
This commit is contained in: