Merge "Merge "Fix notif content when child updated to top level" into rvc-dev...
Merge "Merge "Fix notif content when child updated to top level" into rvc-dev am: e52160f4 am: 9f4885b9" into rvc-d1-dev-plus-aosp am: 8c40028e
Change-Id: Ibc4bd033e65c4c6b9325f4aa0ddaacceb5229deb