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

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

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