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

Change-Id: I5927d813dfd6731075d8ca10b2a3d3d676961db2