Merge "also log user-initiated notification collapse events" into oc-mr1-dev
am: e72e8b1528

Change-Id: I7a65e5ac332cb5f9d0b6cad8cb346132dfe74949