[automerger skipped] Allow OEMs to update old 32/64 devices' vendor partitions. am: 5127c802d6 -s ours

am skip reason: Merged-In Ieca1d6436814f786d555ff1fa2d38881be433511 with SHA-1 22bcb1d069 is already in history

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/kernel/+/3413618

Change-Id: I4e3be94537c9bcec33b6e2159d5e6ae6a456074e
Signed-off-by: Automerger Merge Worker <[email protected]>