[automerger skipped] Merge Android U (ab/10368041) am: 23c2c66bd6 -s ours am: fdc4ecb312 -s ours am: fbbee91da6 -s ours

am skip reason: Merged-In I6f2adc199e9f511b63231ce1ff9558375234712a with SHA-1 f73fc36823 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/vndk/v34/+/24183017

Change-Id: I38170d58287eb17a07f1d2b293022dc579f74c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 4f4c779683c33d3cbe0e4f46cf5cc3d1e332d402
  1. arm/
  2. arm64/
  3. common/
  4. x86/
  5. x86_64/
  6. Android.bp
  7. OWNERS