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

Merge "Merge "Consolidate start new input scenerios" into rvc-dev am: 6c440de7 am: 96863d0d am: 3caa59be" into rvc-qpr-dev-plus-aosp am: 939bcc2e

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

Change-Id: I35b56683b130fa05f6626276bdd52a4196355264