[automerger] Protect VPN dialogs against overlay. am: 016c72c8 am: e2100ac8 am: caf19dfb am: 8c3a23e6 Change-Id: Ifcd6f27ff206d4c81a2b2a1ee07d5e95b1a2a8e4