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

am skip reason: subject contains skip directive

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

Change-Id: Ifbe84450977447c61c61fe6466357a5e369f7f99