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

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

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