Merge "Add new simplified lunch function (lunch2)" into main am: fc19715e am: 07080864

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



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