Merge "Add a flicker test to verify split-task transition after unlocking" into udc-dev am: af4534f6 am: 6e4fd865 am: 0d4656ff am: f7d87814

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



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