[automerger skipped] Merge Android R am: 449f373396 -s ours am: 61926ab2de -s ours am: 5476b1b502 -s ours am: 907fbfd2af -s ours am: 750b7e85e7 -s ours

am skip reason: Change-Id Ie7a92abe3ba5e8ed52e268bc8ee6e2464663a975 with SHA-1 a20b4f3950 is in history

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

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