Merge "Fix the round corner and crop issue after auto-enter-pip" into sc-dev...

Merge "Fix the round corner and crop issue after auto-enter-pip" into sc-dev am: 4f2967f7 am: 6b8859a0

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

Change-Id: I40d4dc10794410c2c9f5e5afe89f82e6f41a1caa