Merge "Fix the regression of PiP position in fixed rotation" into tm-qpr-dev am: d7f99f6c

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



Change-Id: I9c57b981e69d074ae455d9470f1e94fd6d6c09f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>