[automerger skipped] Merge "camera2 ndk: Fix enum values which were...

[automerger skipped] Merge "camera2 ndk: Fix enum values which were incorrectly auto-generated" into main am: 07eb09c6 am: 7abc59c5 -s ours

am skip reason: Merged-In Ib190b17d601ddcc7fb39943b230ce9569c274ea8 with SHA-1 6c37df00 is already in history

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



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