Merge "Utilize from text core platform api surface jar in build" am: b4207052

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



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