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

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

Change-Id: I1cfc6b3f1de1b5283cac92b442c7b52759b8c197