Merge "Camera: fix an issue regarding ndk/vndk availability callback" into...

Merge "Camera: fix an issue regarding ndk/vndk availability callback" into main am: 6b443cf3 am: ec49efbe

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



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