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

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

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



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