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

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



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