[automerger skipped] Merge "Update PiP Flicker tests for content overlay" into...

[automerger skipped] Merge "Update PiP Flicker tests for content overlay" into udc-dev am: 2361fd5c am: 90176179 -s ours

am skip reason: Merged-In I402aa1baf5c829fb12c30af659bc2827d65853a0 with SHA-1 b0d08a3a is already in history

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



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