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

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

Change-Id: I43c038eda1627bc6f9c437b7fcaf102853618442