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

Merge "Reland "Consider non-shipping lunch targets to be future."" into main am: 93e0aad0 am: b8425a4f

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



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