[automerger skipped] Merge Android 12 am: ce8144a33e -s ours am: 9fc901b8d6 -s ours

am skip reason: Merged-In Ia0563707c50e37047031f278c89f590eeff2c1cc with SHA-1 82acd5f945 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/vndk/+/1847706

Change-Id: I3621875450619cee2a9de56b5368f768b0484b99