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

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



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