[automerger skipped] Merge "Revert "Enable mainline prebuilts on tm-dev...

[automerger skipped] Merge "Revert "Enable mainline prebuilts on tm-dev branch."" into tm-dev am: 525d7a8a -s ours am: a964f90c -s ours

am skip reason: Merged-In I9731400acfade95b3eab8f2d99fddb4cf856aa91 with SHA-1 4a71082e is already in history. Merged-In was found from reverted change.

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



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