[automerger skipped] Merge "[DO NOT MERGE] Handle landscape and portrait display for PIP rotation" am: 316b537c am: 80678b47 am: e7eab0cf -s ours am: 9c04f33d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I29825a9208f04f44fcdcdd0ed0961de5e360e02f