Swaps position of expand button and bell icon.

This change puts the expand caret at the end of the notification header
if the new interruption model is turned on, and moves the bell icon on
noisy notifications from the end of the header to directly after the
header text.

Test: manually
Change-Id: I2a97f80920598f5f99f2d9c3b14d58858e1de1bb