Merge "Fix numeric selection from lunch menu" into main am: 3939d1ca am:...

Merge "Fix numeric selection from lunch menu" into main am: 3939d1ca am: 113d445e am: 7da0b500

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



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