Merge "Send out USER_PRESENT broadcast on screen on if lockscreen is disabled." into cm-10.1

Change-Id: I536642f202492a4cd11eb0ad097f440d9b040761