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

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

Change-Id: I91df03e864dcb30dd528ea287f9b29cbd4ec5cf2