[automerger skipped] Merge "Fix PiP rotation when Shell Transition is on." into sc-v2-dev am: e266d53aa5 am: 39dd66b667 -s ours
am skip reason: Merged-In Iebd847ab0d7dc394fc64bb54cdc5262db7b9f1b0 with SHA-1 7aee8686b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15520839
Change-Id: I515c49458ded6a8ac26f992f646c1a0259f9c358
This commit is contained in: