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

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

Change-Id: Ia908bd16d76d5efd172e1399b15f352615352f67
Signed-off-by: Automerger Merge Worker <[email protected]>