[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 60df5b38f8 -s ours am: 10141e24af -s ours am: 6218b76ba6 -s ours

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

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

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