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

Change-Id: If900759c5c2c097a1f731859c49d3ed3b6608296