[automerger skipped] Merge "Convert mask types from uint32_t to enum type" am: d140a24c72 am: daaddc8ff7 am: 903c68bae2 -s ours

am skip reason: Change-Id I4538dd9114192464c25397e2e4b6b6153f947c36 with SHA-1 ef8915de0a is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/1510590

Change-Id: I29ecd524c052eae878bd27df2777bebee5494979
tree: 2c2b4ae456cc6050aaca2d5d85163e324d1428ec
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS