Merge "Update checkapi error message to provide more guidance" into main am:...

Merge "Update checkapi error message to provide more guidance" into main am: 0978d6a4 am: c080eb1d am: a212fe65

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



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