Merge "camera2 ndk: Fix enum values which were incorrectly auto-generated" into main am: 07eb09c6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3006166



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