Merge "Ignore long forms of flags the same as short." into main am: b481086ac9 am: e0b0f9308f

Original change: https://android-review.googlesource.com/c/platform/development/+/2926813

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