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

Change-Id: Ifa46c8e45f307d924c2ea589345957736dee0db0