Settings: Align Notification drawer behavior layout w design guidelines

A category is not needed for a single item - use the item title to
indicate it instead

Change-Id: Iffc78b3fd20fd29832b8f9baae322c79e4af8c87
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2