[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: bcc75f0b am: 5ffb396f am: cdf8df00 -s ours

am skip reason: Change-Id I7f32a7c7741dea88fa2fd8a2e7fe50d0c31eb2e7 with SHA-1 93ce89aa is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510612

Change-Id: Ib4ed380a7352c07b58dd9fff5e5de784dec1a7cc