[automerger skipped] Merge "[DO NOT MERGE] Handle landscape and portrait...

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

am skip reason: subject contains skip directive

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

Change-Id: I289bc7e6bacc8abf6b6279bd8eaf787c3fedeab0