Merge "Merge "Allow same matcher to cancel >1 event activation" into qt-dev am: de7e1ccb0c am: 44149fc2c1" into qt-r1-dev-plus-aosp
am: 04e9c31f14

Change-Id: I75a8cb06146915a2863af77b5ab724d8150369b1