Merge "Fix notification grouping and section bug" into rvc-dev am: d04af4c0 am: 4601188f

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

Change-Id: Ic8530cdbe1c65a33b3f8d4cb00ecbd96bb86c2fc