Notification cancellation fixes:
Permission should only allow cancellation of other app notifications, not enqueueing.
Fix checkapi breakage.

Change-Id: Idbcfd4617057984250dc4d4fa32ff55bfbb155e2
Rebased repo to rootbox
Merge remote-tracking branch 'rootbox/jb-mr1' into jb-mr1