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 am: 70fca59c

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

Change-Id: I91877e9e626559e2617c6139546b4655be4e7622