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