DeskClock: re-write delayAlarm for intercepting alarms when in-call

While the previous clean-up was necessary, it no longer meets the spec.
This feature needs to trigger the alarm immediately after the call finishes.

Conflicts:
	src/com/android/deskclock/alarms/AlarmStateManager.java

CRs-Fixed: 1014635

Change-Id: I27056d12f3b65c9c01329891623c38b0bbb4b107