[automerger skipped] Merge "Convert mask types from uint32_t to enum type" am: 1f551d879a am: 935aef6d78 am: 5811ae4ae7 -s ours

am skip reason: Change-Id I07e96ae99724f38fe0b40194f4feab7ff68418e7 with SHA-1 9da19c7cfa is in history

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

Change-Id: Iafbc6fa69414ff45392eab57d82f0ff2af275253