Merge "Mark some testcases in MainActivityStartsSecondaryWithAlwaysExpandTest...

Merge "Mark some testcases in MainActivityStartsSecondaryWithAlwaysExpandTest flaky" into udc-qpr-dev am: a2239704 am: 64463f92

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



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