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

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

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