Merge "Re-enable testHandleIdleMaintenance_deleteStaleSessions."