Merge "Remove Enum.h error-only header" am: 134b8f0adf am: ec2fe4d478

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1879176

Change-Id: I9e25623155f26e05db2586eba2457523ac483f1f