Merge "Fix TestTaskOrganizer's handling of root splits" am: cadfd7fa48 am: ba1b5145b8 am: 6e2001f638 am: 2ad078007d am: 2bed490b16

Original change: https://android-review.googlesource.com/c/platform/cts/+/1447085

Change-Id: Icc434fa1f486d8c5d97cbac2ce3f184c79b40ee8