Proper supplementary service notification handling (4/5).

Move toast generation to correct place, and abstraction for pieces of
data we want to map into InCallUI.

Change-Id: Ia249c926d3228d850064a705454c42ec9a53c524
Merge branch 'cm-12.0' into mkl