Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces" am: c72f456b19
am: 2a94e4025f

Change-Id: I1b26dc64eaab2151e6885fd01cc5e8d4e18c4e60