Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" am: 63e5bd6b am: 21f01098 Change-Id: Ifb0b5b9742a9a4c0c4c1845c647184d65cff8e4f