Merge "Update FP listening state on keyguardGoingAway"