[automerger skipped] Convert hidl_bitfield and bitfield to int am: c9d3b7b9d6 am: f60e5afd6f am: 54068d9df2 am: 263416e1fb -s ours

am skip reason: Merged-In I2963200311494718ae89af8deade0b1dd41354f8 with SHA-1 6d8e49a05e is already in history

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

Change-Id: I345a40a7b866ca9fdf469c4f385c8ac795270d53