[automerger skipped] Merge ab/6749736 in stage. am: e47e9bd031 -s ours

am skip reason: Change-Id Id704e1ada68cdde51a15744a1d0a9d28dc4e9d45 with SHA-1 a12fdb7f28 is in history

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

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