[automerger skipped] Merge Android R am: 449f373396 -s ours am: 61926ab2de -s ours am: 5476b1b502 -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: I6f74e474078666a69d7b895127cf29dcd56f52b9