[automerger skipped] Merge "Convert mask types from uint32_t to enum type" am: 30a37a7a4b am: 1478481533 am: 38eedb9d19 -s ours

am skip reason: Change-Id I8f1e6fa2bbad8900fdae66f01ac70c75953fd62c with SHA-1 27aa8b3a53 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1510315

Change-Id: I5d80b9ecd76fbcdaf9c82904c668b988e7a0f640