Make notification-shade-collapse-after-dismiss behaviour configurable.

Change-Id: Icbf706a582279b86d901fb727b58663713606521
Settings: Tweak strings for notification drawer auto close

Change-Id: I5aa8c8a6876aad59cf578d31edfa8a099d2dbd97
Settings: Use US spelling of behaviour

Change-Id: I75d2f4d35e29fe9cd4da3852f2579804910a6dfc
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 'upstream/cm-10.2' into dark-jelly-cm-10.2