Merge "Support multiple Vpn ManageDialogs" am: 12e55c99af

Original change: undetermined

Change-Id: I738035a6c3407c7a97f2b700c1f5f1b248ddf477