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

Change-Id: I09148d777617ccb4852931250f1b70314c41da48