[automerger skipped] Merge "Improve flags for compliance tools." into tm-dev...

[automerger skipped] Merge "Improve flags for compliance tools." into tm-dev am: 99b87147 -s ours am: 0ce6e459 -s ours

am skip reason: Merged-In I4090dae3d5d33d1908d67dff31aeee92d2b261da with SHA-1 986a8391 is already in history

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



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