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

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

Change-Id: I4fae013253c5f03fd515b09d29125bb120724777