[automerger skipped] Merge Android 14 am: 2aeb758a69 -s ours am: a2412a3d53 -s ours am: aa700daf13 -s ours am: 8554f48df4 -s ours am: 358fbd5a82 -s ours

am skip reason: Merged-In I4ae7cff7bec2d3a615c11028ad089bfa469a5c4e with SHA-1 0ab081bfe2 is already in history

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

Change-Id: Ic65090cdc4ee85ed859e40679c394ceedf031714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 971f74f6fda8afe69b443ab91f23e496cc9d0020
  1. apex/
  2. Android.bp
  3. OWNERS