Merge "Add new appop for Platform VPNs"
am: b8dd5bcc23

Change-Id: Ia44f9491f3951e3f7dda2c03e5d33452bb2e94d3