Merge "Prevent agents from delaying system daemon threads"
am: ec7d54c13a

Change-Id: Ic1ff0f9a5e25f8b870ad5085db671b9d95609be8