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

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

Change-Id: I94e4ac0b16865979799be0287f1d0f0023ddca40