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

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

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

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



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