Merge "Try to fix ActivityThreadTest failure on foldables" into sc-v2-dev am: 88c6602ef9 am: 9bc0350cee

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

Change-Id: Iea3efbf991883bcb992625ece9e69e115d794414