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

Merge "Fix notification grouping and section bug" into rvc-dev am: d04af4c0 am: 984890be am: 292cac6b am: 08dab9bf

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

Change-Id: I7fd9e3926ac1effbfa5ff8857a6e399554fc1d2e