Merge "aconfig: improve error messages" into main am: 4d37a829 am:...

Merge "aconfig: improve error messages" into main am: 4d37a829 am: 62e1afb3 am: 7a7ca683 am: 776aa0e2

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



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