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

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

Change-Id: I8b63358dda686b13dffeae672182b55d4f51441c