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

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

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