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

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

Change-Id: I4d9466959af6a5c0acbe5a26acad634626075822