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

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

Change-Id: I93334ba33e3d5b733e883cca0b1f3c92c2a73e1f