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

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

Change-Id: I6b4b2d4f28bfd17a0eee6674140248d5faca02fa