Merge "Fix rendering issue after cancelling Notifications inside a group" into...

Merge "Fix rendering issue after cancelling Notifications inside a group" into tm-qpr-dev am: ae41b142 am: 77dff213

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



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