Merge "Add unconverted reason for jarjar incompatibility." into main am:...

Merge "Add unconverted reason for jarjar incompatibility." into main am: 6b6b150d am: 7d941462 am: 1397a3a9

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



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