Merge "Rename API surface provided to mainline modules" am: 9bedfd0d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2400022



Change-Id: Iadf6eba8f3e90c075c1d67bb14e8b4741dc6a995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>