Merge "Split flaky app close assertion until the bug is fixed." into...

Merge "Split flaky app close assertion until the bug is fixed." into udc-qpr-dev am: 0b9d4413 am: 4e9ef6ce

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



Change-Id: Ie4db08698dca36f0edee618013434b57e8c2b8b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>