Merge "Convert mask types from uint32_t to enum type" am: f3a60ed85c

Original change: https://android-review.googlesource.com/c/platform/cts/+/1510352

Change-Id: I338ca038d88099a3271a78c57804156305016eed