Merge "Add MANAGE_IPSEC_TUNNELS Permission" into pi-dev am: 0205fd1064
am: 4ca771aa5c

Change-Id: I60dcb191a9aea3ff513a4c46c2c59d7f068e843c