Merge "Fix resolution of features referring to dependencies." into main am: fa42d00e93

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

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