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

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

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

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