Merge "Use the injected device id for events that are a11y trusted" into sc-dev am: 9473f5563a

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

Change-Id: Ibf4e638a71c3ba28abbc7afc411928a75daf2e24