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

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



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