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

Change-Id: I7f1c987901c3634fb81d93402d5cb0af80fff11e