Add back supplementary service notification handling.

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