[automerger skipped] Merge "Fix PiP rotation when Shell Transition is on."...

[automerger skipped] Merge "Fix PiP rotation when Shell Transition is on." into sc-v2-dev am: e266d53a am: 39dd66b6 -s ours

am skip reason: Merged-In Iebd847ab0d7dc394fc64bb54cdc5262db7b9f1b0 with SHA-1 7aee8686 is already in history

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

Change-Id: I515c49458ded6a8ac26f992f646c1a0259f9c358