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

Change-Id: I1ecb2c5e0d001369295017f2f5b3015ca6b4e356