Merge "Revert "Prevent agents from delaying system daemon threads"" am: 5c8b35109f
am: a3f7b055e5

Change-Id: Ib9fbb094492bc764cfd02c970d45d6575b61766f