Merge "Consolidate start new input scenerios" into rvc-dev am: 6c440de7

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

Change-Id: I6cfec02a3eaad9e5cb86c2a5811c40f3b5f3a8d0