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

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

Change-Id: I1c80dd309aa9a1401cce5b0a083507aac598355a