HeadsUp: Clean up.

Change-Id: I98f445e7a4c92a34a3d9f63e14135e92416875ff
FWB: Hover, notification timeout (1/2)

Change-Id: I645c68f6ae62ba363f00a0237ae7970982d60a39

Conflicts:
	core/java/android/provider/Settings.java
FB: Add Dialpad key padding [2/3]

Add top and bottom padding to Dialpad number keys to make the layout seem
        less crowded.

Change-Id: I04f02963da82df5ebfbfa2936c3060355169b479

Conflicts:
	core/java/android/provider/Settings.java
Reset battery stats [1/2]

Change-Id: I90c1d1ab73c2187b68230a6db1db19dec2a5924b

Conflicts:
	core/java/android/content/Context.java
	core/res/res/values/strings_custom.xml