Merge "Merge "Fix always-null children on NotificationEntry" into qt-dev am:...
Merge "Merge "Fix always-null children on NotificationEntry" into qt-dev am: ab6d2d31 am: 14c2b638" into qt-r1-dev-plus-aosp
am: 19c439e7
Change-Id: I147c288f45a6f54312dd8bee4d296d5efa4ab8d3