Delay coming out of doze until keyguard dismissed

v2 (earlier attempt was reverted due to deadlock)

Don't come out of doze when screen is on, but
wait until the keyguard is dismissed as well.
Pass along the keyguard dismissed to DeviceIdle

Request exitIdle when notifications are clicked.

Bug: 63527576
Test: Manual:
       Turn off screen
       adb shell dumpsys battery unplug
       adb shell dumpsys deviceidle step x4
       Turn on screen, verify still in doze
       Unlock, verify out of doze

Change-Id: Ic5129611d4f098723b31d62a27db8f50860697d4