[automerger skipped] Merge changes from topics "input_events_id", "wire_input_event_id" into rvc-dev am: 0253cc8f2f am: 028d3efd48 am: f7d59ef041 -s ours
am skip reason: Change-Id I2a57767b08c88bbb84cc1dfd4f21f1b3c22af773 with SHA-1 8291ac23f8 is in history

Change-Id: I0efd0197f82f9741d42ed75ba81a1ee632a4d85c