Fix S and T mixed build OTA am: 1c4b981c71 am: 0c7fbe95c8 am: 1d5acb2b6c am: 9a79f4529f

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2058027

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