[automerger skipped] Merge Android U (ab/10368041) am: 890126f081 -s ours am: a72834c4fb -s ours

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

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

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