Merge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev am: 80a2bba9a6
am: c1c08d10d1

Change-Id: Id720461505599eaa5f6a5e5f880ec365deb74c77