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

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

Change-Id: I2100902434f870a9c4db362110912457cc1ba8f5