Merge "RESTRICT AUTOMERGE Update FP listening state on keyguardGoingAway" into tm-qpr-dev