Merge "Split flicker tests into groups" into sc-dev am: 608a4392 am: 976edfdb am: ae735d28

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

Change-Id: I3824d2fde06d3926bc77e4e149d0fe9d0f954543