Merge "Revert^2 "Prevent agents from delaying system daemon threads""
am: c816d24f1e

Change-Id: I6f6791dc028f6d9080c836a62045642ddbe9f79b