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

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

Change-Id: I97a8cfa683ebbbf6f0fcd3138db846e8a3ec4a86