Fixes headers for new and older calls.

The attribute android:drawableBottom does not work as I expected (it
works as documented though).

Instead, use the same pattern used for headers elsewhere in the
application.

Bug: 5152462
Change-Id: I4b3f9b0d959c9f69c90ef8181b98e62f6031d25d