tree f2f160db9b98b40e863a75eea069f9cc38341753
parent 55468e334382ebc34c4c7ffa9471b0661842e33f
parent 88c6602ef9fb0fccf67259119a79493ea755c4d3
author Charles Chen <charlesccchen@google.com> 1637160452 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637160452 +0000

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

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

Change-Id: Ia222646249843c3e04eca50ca82e4aac0f43fa57