Merge "Only associate the same windowing mode to a transition info" into sc-dev am: 216d32af am: 8ebabba8

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

Change-Id: Iaa240bc2830a850173b122eb96811a9d1b99bdef