Merge "Fix broken test_lunch.py" am: b4f831d56b am: 046230b625 am: d19278fe06

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

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