Merge "Revert "Consider non-shipping lunch targets to be future."" into main...

Merge "Revert "Consider non-shipping lunch targets to be future."" into main am: 874da86d am: 83830437

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



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