Correct double tap to sleep summary

Change-Id: If2e7ab2c138e72eeb7d862738bb7dd3ad43d4b16

(cherry picked from commit 17a4ed42b7500e29c061cec1b1e1a29b401a0a83)
Correct development shortcut summary

Change-Id: Ia776d25c8f58789c3eedf16b7d5c705b04130b5f

(cherry picked from commit f9e9e7417ce83cfe7a94f750e9ac111ac31d5ea8)
Improve notification tone string

Change-Id: I731903a7bcda38229502de33dbc83c44e3782996

Conflicts:

	res/values/cm_strings.xml

(cherry picked from commit fce26a02abd552c7ea1a62ff000e80376a0df1a9)
Protected Apps: update protected apps screens UI

Change-Id: I2dd922956f8ffd9ed153c3d1aa1f9161a127e4c6

(cherry picked from commit 3423ab01dafb4bae5737360e25d22451bc846f39)
Remove unnecessary drawables for launching Protected Apps

Change-Id: I58f471ef9d64c7ced79befbfc30b94d75a0085a2

(cherry picked from commit aa2f89fb0a5997bbadd42a14bcaf667c9d818ef8)
Move Blacklist and Notif Filter to Privacy

Match CM 11

Change-Id: I5e3f9c26b68a89ba1622d95e2d0e4f4a93361c5e

(cherry picked from commit 1a15aa15f0a2676cc6193cdc48cf1f795ffe2ee1)
Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1

(cherry picked from commit a4ccf640daea53c814f217395add55944e6a7b05)