Merge "Use new aliases property to rename dependencies where necessary." into main am: 70d931f8c2

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

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