Merge "Properly marking TaplTestsSplitscreen with test annotations" into udc-qpr-dev am: 51ba9a6097 am: 1eca4f907b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24512901

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