[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 skip reason: Merged-In I3ed091156c4b39dad6eaf578144ac3d070025988 with SHA-1 03e32400 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18467382

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



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