Merge "Revert "Revert "Don't filter out groups if summary is re-inflating"""...

Merge "Revert "Revert "Don't filter out groups if summary is re-inflating""" into tm-qpr-dev am: 94734ecc

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



Change-Id: Ifab9c1dadb762e21eab83d509081231a628bf5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>