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

Merge "Fix the animation position when launch into PiP" into tm-dev am: 83979ad7 am: bc6f5f18 am: e9326b73 am: 39a34c0f

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



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