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

Merge "Merge "Fix the round corner and crop issue after auto-enter-pip" into sc-dev am: 4f2967f7 am: 71d9bd0b" into sc-v2-dev-plus-aosp am: 8b6903a7

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

Change-Id: Idbacb31c536f0e4c12ee5a2326d7a6e2a016d56c