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

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

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