Add back supplementary service notification handling.

Change-Id: Id4cdc4dbae1c262041ab3afcb3264dfe6d3673fa
Merge branch 'cm-11.0' into martincz