[automerger skipped] Mark an ActivityThreadTest as flaky am: 0492d8febe -s ours am: e84a831f45 -s ours
am skip reason: Merged-In I2452db8523438de4d06c938c3c3fa1d8a9aa0f4e with SHA-1 0b6ea59fe0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15336321
Change-Id: I4d4df237396bfb1a52ed3ad529b24fa349ac6ba7
This commit is contained in: