DO NOT MERGE Dismiss system dialog

This fixed the keypad remains ON when switch facet issue.

BUG: 130573446, 149228466
Test: Manual

Change-Id: Ia449fb41a03bc02498471ded660d573d5b1ad141
(cherry picked from commit 82298783683ebe82a5847dfd35fc8b3528709930)
(cherry picked from commit ebff32a5d61cdf6f6812588ab4e60ba869dad306)
2 files changed