Merge "aconfig: fix workspace resolver warning" into main am: bc7f1a2e am: c0e7137b

Original change: https://android-review.googlesource.com/c/platform/build/+/2932072



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