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

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

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