Merge "Fix layout been truncated after activated split screen" into sc-v2-dev am: 93e22893e8

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

Change-Id: I440334a2ac5686d93e8b62ffd5406567227a772c