Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces" am: c72f456b am: 2a94e402 am: da48f0f6 Change-Id: I4ea421e4126a45f65d25fe0bec74243a3b20aeab