[automerger skipped] Merge "Add a new flag to stop disabling lint errors" into...

[automerger skipped] Merge "Add a new flag to stop disabling lint errors" into main am: bf3e32d8 am: 35f97155 am: 93f8da62 -s ours

am skip reason: Merged-In I10577dacbd7ea8063c6e1e02f3b6c60a2bee5094 with SHA-1 856cedb2 is already in history

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



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