Merge "Enable preventSystemServerAndPhoneDeadlock fix" into 24D1-dev