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

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

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