Merge "implement keyguardGoingAway() fixes build." into lmp-preview-dev