Merge "Fix notification grouping and section bug" into rvc-dev am: d04af4c0 am: 984890be am: 28045ff9

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

Change-Id: Ic91eaa91eaaac81015cb8787a6468ba4d0a72cce