RC: Ribbon fix reset method derp.

Change-Id: I3d71e3851d53760f7d328aef1e564f0e0a537190

Conflicts:
	src/com/android/settings/carbon/RibbonTargets.java