Adds badges to the expand button

Bug: 16242770
Change-Id: I6966c86cfda4ccd51ee15e7172ba25b7b2f6ae3d
3 files changed