[conflict] Merge "[conflict] Merge "Update wm flicker tests to account for...

[conflict] Merge "[conflict] Merge "Update wm flicker tests to account for seen filter" into tm-qpr-dev am: 9ec7a593 am: dc535ab3" into udc-dev am: 73fc00bb

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



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