Merge "Stop sdk_library generated api_library to depend on full surface...

Merge "Stop sdk_library generated api_library to depend on full surface api_library" into main am: f5ee8e3f am: b880908c am: 740c5a40

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



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