Merge "AOD: Prevent KeyguardAffordanceViews from triggering in doze"