[automerger skipped] Better errors from build-flag am: 2f75608e -s ours

am skip reason: Merged-In If4dc13e0e895823f50de1f5c7e929bb05eac69a0 with SHA-1 310ccc2a is already in history

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



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