[automerger skipped] Improve flags for compliance tools. am: ccf94749 -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: Ifa05d03ba792a4232215397b52119dab0e3d693e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>