Traffic meter: Selectable summary timeout [1/2]

Change-Id: Ib3465fa2c719822d09cd7ba107a047c889b4a93f

Conflicts:
	core/java/android/provider/Settings.java