[automerger skipped] Merge "Create WM Shell Flicker helper library" into...

[automerger skipped] Merge "Create WM Shell Flicker helper library" into udc-qpr-dev am: a9f22a1e am: 80732e85 -s ours

am skip reason: Merged-In I5db19729c3968aba66dc3dfce1f3eafe9f1a0972 with SHA-1 73058b51 is already in history

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



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