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

Change-Id: I396dd3a19cb51ce5933a69563e0dc9ef274244c9