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

Change-Id: I524fc50209eafaebafe2231c3d67a2f8f3950949