Merge "Merge "Fix the animation position when launch into PiP" into tm-dev am:...

Merge "Merge "Fix the animation position when launch into PiP" into tm-dev am: 83979ad7 am: 21482ebd am: 7f48b2a9" into tm-qpr-dev-plus-aosp am: bdc5d264

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



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