[automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8 am: 8c3a23e6b1 am: 22a1644e1f

Change-Id: Ibf6f6756222042d8faf7342e365d37a4fa28cdc1