Merge "Refactor api.go to simplify Android.bp further" am: aa2823a482 am: 56b48d8c69

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

Change-Id: I070124c5458dca61b7d47e9190a9156dcb4f940b