Merge "Split flicker tests into groups" into sc-dev am: 608a439238

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

Change-Id: I319ed54afe9b16a64f979c2e315ba6f4bc8c4788