[automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8

Change-Id: I7f8a6762ceb6382f8c7f760a3d77a48b61f968a3