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

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

Change-Id: I3952e9eb131cc47464484b2f36fa35e3476d819a