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

Change-Id: Ib7a198e0c1ad0ecc3090799933d9cae3eb84b42a