Merge "Revert "Give an error when trying to build "next" targets"" into main am: d5799abc

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



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