[automerger skipped] Improve flags for compliance tools. am: ccf94749 -s...

[automerger skipped] Improve flags for compliance tools. am: ccf94749 -s ours am: 263b5d0f -s ours am: 09a69942 -s ours am: 31e8134c -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: I15e760a3610ce94ea04838a6ba32fd5e745e2119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>