Revert "Combine InCallUI & Dialer (part 3)"

This reverts commit 9c97bc77467add69010e450843e86fab50e8cb46.