Merge "Handle cfg-gated dependencies." into main am: 05a98780a7

Original change: https://android-review.googlesource.com/c/platform/development/+/2836597

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