Merge "Fix the scale for entering PiP animation" into tm-qpr-dev am: 571b988b am: fc1b9786

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



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