Merge "Cleanup in ExpandableNotificationRowTest" into tm-qpr-dev