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

Change-Id: I6f6e3d2a43172459ef5bc88b6fc3d3fbbfd04a2f