Merge "Split flicker tests into groups" into sc-dev am: 608a4392 am: 3d7bed9d am: 0ae3d7e4

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

Change-Id: Id39f610eb07e9d93fb9c0903a08c2d5d183e3f7c