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: 6b8859a0" into sc-v2-dev-plus-aosp am: 24e0be6f

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

Change-Id: I9519c2d9ca6d698d8274917922da1de3a9cd4131