[automerger skipped] Merge "Convert mask types from uint32_t to enum type" am:...

[automerger skipped] Merge "Convert mask types from uint32_t to enum type" am: 7cd03182 am: c410c10d am: 8e654fb2 -s ours

am skip reason: Change-Id I42506484b1d0b0482618b7314fad4c8012a06fb4 with SHA-1 55773033 is in history

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

Change-Id: I7186a62aff173a7e9b55f35cc0863d278b0782c1