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

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

Change-Id: I328d053c7fbaadbf61cf7d21a8d3342a9f4ebd3f