Merge "Re-enable checks for MANAGE_IPSEC_TUNNELS"
am: 69c973b33f

Change-Id: I071f4f1c797d03776d1dd38f5734c6d07e2cecc7