Proper supplementary service notification handling (1/5).

Remove CAF's passing of implementation details from the base classes,
and replace it by well-defined call properties.

Change-Id: I4fa94d4ba68a1570d3f822be569ae124882c0e66
Merge branch 'lollipop' of https://github.com/t-rex600/android_frameworks_base into lollipop
Revert "Fix battery % always showing at < 100%"

This reverts commit 5f6c085ea46c80dd7b208288480c82f58b66ec57.