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

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

Change-Id: Ic21a1b1df480e9d7fa73fd9ab3669c929241212b