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

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



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