Charging animation - fixes
Filter spam notifications [2/2]

Change-Id: I4056aceada3cf8397827037bcb52388de9f8b9fc

Conflicts:
	AndroidManifest.xml
	res/values/custom_strings.xml
	res/xml/misc.xml
try to fix