Make the bundle expander & the normal expander consistent

This means:
- Use the correct font for the the non-compose expander
- Adjust spacing when showing the number in the compose expander

Bug: 433292921
Test: manual, compare the two expanders side by side
Flag: android.app.notifications_redesign_templates
Flag: com.android.systemui.notification_bundle_ui

Change-Id: I8b47ec66c72b47eefc778a3a004e733759fdd79f