Bring back Lockscreen notification (2/2)

This reverts commit 4b31ef471c3d6ee259a8c8910fbecd2cf8976a2c.

Conflicts:
	res/values-zh-rCN/cm_strings.xml
	res/values-zh-rCN/pa_strings.xml

Change-Id: I5bd856976b4b53bb18511b52b2e0297d03feb335
fix merge derp

Change-Id: I9bfadf95bf24b8b55a6cd221c97a68fd945e2d11