[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: 971881fc -s ours

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

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



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