[automerger skipped] Merge "Add transient notification views of group children...

[automerger skipped] Merge "Add transient notification views of group children to the child container, not directly to the row." into tm-qpr-dev am: e07cc86b am: 2b484e12 -s ours am: 7ad77ab9 -s ours am: bb38a047 -s ours

am skip reason: Merged-In Ib5722ee5e6f5ae46902f276bd2bca7d6544e32a2 with SHA-1 506a24fa is already in history

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



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