Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into udc-qpr-dev am: 140534a783 am: dc53a4ca8f

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

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