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 am: 49fd2ab4

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



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