Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into stage-aosp-udc-ts-dev am: e410f8ccc0 am: f479d8837b am: e7f19eb9c1 am: b1318101e6 am: 0d73f254a4

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24060409

Change-Id: I4a4a88db6014aa5df6f6cc76cc0e65080072118f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>