Merge "Call userActivity when dismissing keyguard" into nyc-mr1-dev am: b11cc6cbd3
am: 53b4a2d6cb

Change-Id: Id2fd652b14fc80db72157586d3f7cd776001d28b