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: 8ab9434e

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

Change-Id: I86ba218969ada82fc72b30f88b4d77f110aee90e