Merge "Reset keyguardGoingAway status when AOD is showing." into tm-qpr-dev