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

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



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