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

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



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