Merge "Add default choice to HandleInput class" into main am: d7e652e679

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

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