Merge "New Pipeline: Show group count" into sc-v2-dev am: 76292931f4

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

Change-Id: I49001485a4810d17fc8eb29af521aecf6f0c16b8