Merge "Convert mask types from uint32_t to enum type" am: 7cd031828f am: c410c10dfa

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1510515

Change-Id: I90c3487ebb936f37eb92bf862205c9bdb5eb1d09