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: ef3c1d65

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



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