Merge "Refactor handle_input to take a map of choices to functions" into main am: a2914b1d65 am: 22a67e405c

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3492553

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