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

Change-Id: I29a5f515983215f7600c613c1b11c1baa567d5a3