Merge remote-tracking branch 'goog/mirror-aosp-master' into stage-aosp-master am: a4fdca9fbf

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/abi-dumps/vndk/+/19414964

Change-Id: I7ce8e8696a2abb7191653aa7b3018818418240ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: da3f73604320a29255bfa545d0d6181836678332
  1. 29/
  2. 30/
  3. 31/
  4. 32/
  5. 33/
  6. R/
  7. Android.bp
  8. OWNERS