Merge "Require serialno field for brick OTA package on release-key devices" am: 00bfe128f9

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486120

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