Merge "Crash when using the insecure constructor of ExpandableNotificationRow" into main