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

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

Change-Id: I1ae0f3d9865d53a5ee51ab4995eff5802d10e98a