torch activity/intent

Change-Id: I7350da6f49972232d1cf4cab81bedb0094dfe799

Conflicts:

	packages/SystemUI/res/values/strings.xml