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