Merge "[conflict] Merge "Update wm flicker tests to account for seen filter" into tm-qpr-dev am: 9ec7a5933c am: dc535ab32e" into udc-dev am: 73fc00bb8a am: 09e3da4e5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21562541 Change-Id: I0ec59e6ca5bc101ebb16e4dc7447e6efa8c34b63 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: