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: 28045ff9 am: 021fad38

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

Change-Id: Ie4c37a59935c93da838bf6c0df4c0b64d2a634d6