[automerger skipped] [DO NOT MERGE] Handle landscape and portrait display for PIP rotation am: d7282448a6 am: 250f1b8f55 am: 4f77ba81d0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9f678097bac9274621e101ec0a9caab0723ddf62