Merge "Remove ExpandableNotificationRow#getExtraBottomPadding()" into tm-qpr-dev