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

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



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