[automerger skipped] [DO NOT MERGE] Handle landscape and portrait display for PIP rotation am: d7282448 am: 250f1b8f am: 4f77ba81 -s ours am: ce429b9a am: 85970490 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib34871e922cd231547e777c0fedd3e329fc71f9d