[automerger skipped] Merge "Add inputEventId to SurfaceFrame" into sc-dev am: 78253681 am: bbaf5427 -s ours

am skip reason: Change-Id If7e0eee82603b38b396b53ad7ced660973efcb50 with SHA-1 58ca29d4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13436558

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9848e7e97933b254272f62da880f5c2181031703