[automerger skipped] Merge "Make sure ANATIVEWINDOW_QUERY_BUFFER_AGE is identified as VNDK API." am: a6349a7ab2 am: f06008a54a -s ours

am skip reason: Merged-In I9d4ef74dec3315e661e5a01e7b34a9f97f41fe78 with SHA-1 90a90f12ed is already in history

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

Change-Id: Ib3edbfbc27d5ceb7d81a6f2c2a7fd94ce7205419