Merge "Update PreferenceCategory headers to use headline font." into pi-dev
am: 0f96324f5a

Change-Id: I6e6f23da60df09c1233eb8952ae2066d5c9a573e