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

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

Change-Id: I1c8d736c6c93da94d33add905eaa665a68d1a721