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

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



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