[automerger skipped] DO NOT MERGE - Merge Android 13 am: a2ab7362c9 -s ours

am skip reason: Merged-In I5d2fc94a1ef4d2b8be7a7aede9ea05829f09eaea with SHA-1 4d6ae44d7f is already in history

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

Change-Id: I7c31a7e3de8bc77b7f78cab4bc53b4308fd42092
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: d31cdc970da50e17e50e60f4601c5464a1782785
  1. apex/
  2. Android.bp
  3. OWNERS