[automerger skipped] Merge "Refactor api.go to simplify Android.bp further"...

[automerger skipped] Merge "Refactor api.go to simplify Android.bp further" am: aa2823a4 am: 56b48d8c am: ff270f22 am: a25fbaea -s ours

am skip reason: Merged-In I6715fa9d24603e3cbb8b09510b64c2bf6bac1f27 with SHA-1 28eda09c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1947111

Change-Id: I2a9d0880c49cf68ca0954b597cbda82fd25c03f3