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

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

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