Merge "Add a flicker test to verify split-task transition after unlocking"...

Merge "Add a flicker test to verify split-task transition after unlocking" into udc-dev am: af4534f6 am: dad8a38b am: 2561d36f

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



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