Merge "[Bouncer] Fix flicker tests." into tm-qpr-dev am: a98b34d5 am: 1f990fa2

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



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