Merge "Add permission that allows cancelling notifications from other apps." into cm-10.1

Change-Id: I915ee48634e045cfb7d515ad853302875a1f5813