[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: a20b4f3950 -s ours am: 9912e86f4a -s ours

am skip reason: Change-Id Iaecb67ed1eeb890b29ac4e6f2808a6f9dff001c8 with SHA-1 ac7a814e03 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apifinder/+/12470226

Change-Id: I9225c77c7022c9660d2886e997900cfda92a1676
tree: 4c0a7cd9a05c60ea1bef3252d7b8cdb62d9ed881
  1. Android.bp
  2. checks/
  3. src/