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

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

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