Merge "Only run legacy split flicker tests when it is using legacy split" into...

Merge "Only run legacy split flicker tests when it is using legacy split" into sc-v2-dev am: fc7ff7b7 am: ccb4eb05

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

Change-Id: Idded1256db5ec228703e9fe65442f2e002ebfe95