Dynamic data usage [2/2]

Change-Id: Ibd0067418435442d8cff922faf8ef0f6a5a28761
Tweak kill-app delay

*750 just feel a little too long imo. Adjust the delay
 slightly to make it feel a little more appropriate.

Change-Id: I900c0030150d456b4cc43e2349dcffbc13e5145f
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge "Tweak kill-app delay" into kitkat
Merge "Dynamic data usage [2/2]" into kitkat
Merge remote-tracking branch 'aokp/kitkat' into kitkat