Merge "Convert mask types from uint32_t to enum type" am: 1f551d879a am: 935aef6d78

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

Change-Id: I8260afa68f1b0b481cf8de6c14ed3bbda6c2302a