[automerger skipped] Merge changes from topics "input_events_id",...

[automerger skipped] Merge changes from topics "input_events_id", "wire_input_event_id" into rvc-dev am: 0253cc8f am: 3d3bebe0 -s ours am: e1356070 -s ours
am skip reason: Change-Id I2a57767b08c88bbb84cc1dfd4f21f1b3c22af773 with SHA-1 8291ac23 is in history

Change-Id: I1089dfdee48b720a0b68ec26cbb0d4d4ffc2471d