Merge "surface_control: Add ABI type information to `enum`s" into main am: 72e720a93b am: 20fc03cdea

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

Change-Id: Iacc77094671afe332c131cf472c269b3ddd6a6c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>