Merge "Simplify the association of shared starting window" into tm-qpr-dev am:...

Merge "Simplify the association of shared starting window" into tm-qpr-dev am: bf4367fd am: 175ef1cf

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



Change-Id: I92eb03764c6852457926271725996c3b5d791f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>