Merge "Revert "Give an error when trying to build "next" targets"" into main...

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

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



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