Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 63e5bd6b4b

Change-Id: I1ab6d47c17992f8630d9aba892bcef29dcb66bfa