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: e1063037 am: b8cd3f3e

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

Change-Id: I5311dbfd421302fb7c2fd9316abc659dc1ea682c