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

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



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