Temporary hack for making T->S downgrade work am: 25d69c8b

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



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