Merge "Takes NotificationMenuRowTest off main looper."