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

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

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