Reconcile logging of blocking helper and manual notification management.

Unify on ACTION_NOTE_CONTROLS for opening of a NotificationInfo, with
subtype to distinguish whether it's for BlockingHelper or not.

In the non-blocking-helper case, don't log user clicks, just the
action. We can come back to this, but the logs are currently
inaccurate and they aren't essential.

Bug: 123519980
Change-Id: I9189d52f9bd20126b0df5568c8be264107d569b3
Test: atest SystemUITests and manual testing.