Merge "Consolidate start new input scenerios" into rvc-dev am: 6c440de7a4 am: 96863d0d50 am: a96c3690e9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086310

Change-Id: I97daed5472aa72b6e9cda3469ad85cc0e621cbfa