Merge "Require serialno field for brick OTA package on release-key devices"...

Merge "Require serialno field for brick OTA package on release-key devices" am: 00bfe128 am: 421625f4 am: d528b415 am: b93ca40c

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



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