[automerger skipped] Merge "Add new team rules" into main am: c5d86061 am: 0d8443fd -s ours

am skip reason: Merged-In Ia9e97d1a2df50a100984aa6c99f25bedbb8319f4 with SHA-1 d187fff6 is already in history

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



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