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

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

Change-Id: I5b27187b2d68269a537290b71275c0bb62426478