Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider"