LockClock: Add default clock app detection

Change-Id: Ib6bfbb5de765c1e3a0c81a1849343f24b3616e95
merge changes from remotes/github/cm-10.1 into master