Merge "[DO NOT MERGE] Handle landscape and portrait display for PIP rotation" am: 316b537c9a am: 80678b472c

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

Change-Id: I86a26a160cd861b26f9e81ffdda55be2e7ab21c0