Merge "Reject SPL downgrade OTAs on release-keys devices" am: b9dd9dd4 am:...

Merge "Reject SPL downgrade OTAs on release-keys devices" am: b9dd9dd4 am: 923d0cc1 am: 32420bb8

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



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