Merge "Use extra_cfg for dependency resolution too." into main am: 1cd8b42dfa am: 42a6e6ce00

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

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