Merge "Remove unnecessary arch variant for patch module" into main am:...

Merge "Remove unnecessary arch variant for patch module" into main am: aa462958 am: 633fde47 am: 21698a7c am: 14b6e7a7 am: 63e916ed

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



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