[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 167606f9f2 -s ours am: ed1fe7b793 -s ours am: 7e046d8994 -s ours am: 9554bafaba -s ours

am skip reason: Merged-In I5fd6e9a3a4e7ba97f0b2946c49d4e0586335b447 with SHA-1 63a840149d is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/vndk/v31/+/2130158

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