Merge "Remove Enum.h error-only header" am: 134b8f0adf am: ec2fe4d478 am: a83c7535e4 am: 2850b7d89c am: 4c86be7fc9

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

Change-Id: Icce30c592f4af7e14a28a13bfd2cb977b20a5a52