Merge "Use the injected device id for events that are a11y trusted" into...

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

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

Change-Id: I681ba7105fa4d88edb972cb77fe94f64e16ea96a