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

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



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