Use device agnostic strings

Use a generic term 'device' instead of 'phone' for flip and shake
action results.

Change-Id: I8b7ff13071e0c116004084f879d07393114e1002
Merge branch 'cm-10.2' into martincz