Merge "Apply renames when determining whether a dependency is enabled." into main am: a0a93b8d55

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

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