Merge "[automerger skipped] Merge "Cleanup in ExpandableNotificationRowTest" into tm-qpr-dev am: b2dc8d84 am: cd9cbebc -s ours"