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

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

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