Merge "Move onKeyguardGoingAway outside ActivityManager lock" into udc-dev